From 8d05e742120cb0d74f0b3bc9f7bc4a641169df26 Mon Sep 17 00:00:00 2001 From: Alberto Garcia Date: Fri, 15 Oct 2010 14:46:22 -0400 Subject: [PATCH] Make gtk_accelerator_get_default_mod_mask() return a GdkModifierType Fixes https://bugzilla.gnome.org/show_bug.cgi?id=313350 --- docs/reference/gtk/migrating-checklist.sgml | 2 +- gtk/gtkaccelgroup.c | 2 +- gtk/gtkaccelgroup.h | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/docs/reference/gtk/migrating-checklist.sgml b/docs/reference/gtk/migrating-checklist.sgml index 8b5a58a6c9..6acf903be3 100644 --- a/docs/reference/gtk/migrating-checklist.sgml +++ b/docs/reference/gtk/migrating-checklist.sgml @@ -265,7 +265,7 @@ my_widget_expose_event_handler (GtkWidget *widget, GdkEventExpose *event) static gboolean my_widget_key_press_event_handler (GtkWidget *widget, GdkEventKey *event) { - guint modifiers; + GdkModifierType modifiers; modifiers = gtk_accelerator_get_default_mod_mask (); diff --git a/gtk/gtkaccelgroup.c b/gtk/gtkaccelgroup.c index e9bbffee1a..39c63989e9 100644 --- a/gtk/gtkaccelgroup.c +++ b/gtk/gtkaccelgroup.c @@ -1461,7 +1461,7 @@ gtk_accelerator_set_default_mod_mask (GdkModifierType default_mod_mask) * * Gets the value set by gtk_accelerator_set_default_mod_mask(). */ -guint +GdkModifierType gtk_accelerator_get_default_mod_mask (void) { return default_accel_mod_mask; diff --git a/gtk/gtkaccelgroup.h b/gtk/gtkaccelgroup.h index b00b039202..5efe4fa87e 100644 --- a/gtk/gtkaccelgroup.h +++ b/gtk/gtkaccelgroup.h @@ -168,7 +168,8 @@ gchar* gtk_accelerator_name (guint accelerator_key, gchar* gtk_accelerator_get_label (guint accelerator_key, GdkModifierType accelerator_mods); void gtk_accelerator_set_default_mod_mask (GdkModifierType default_mod_mask); -guint gtk_accelerator_get_default_mod_mask (void); +GdkModifierType + gtk_accelerator_get_default_mod_mask (void); /* --- internal --- */ -- 2.30.2